-
-
Notifications
You must be signed in to change notification settings - Fork 111
fix: resolve code fixer merge conflict markers in multi-target projects #4615
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+34
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When running migration code fixers on multi-targeting projects, Roslyn inserts merge conflict markers when different TFMs produce different transformation outputs. This happens because semantic analysis can fail for some TFMs due to different package versions or missing dependencies. The fix modifies the namespace verification methods in all three migration analyzers (xUnit, NUnit, MSTest) to only return false when the namespace is positively NOT the target framework. When namespace resolution fails (returns null), we now assume the syntax match is correct and return true, ensuring consistent behavior across TFMs. Fixes #4612 Fixes #4613
Contributor
Code reviewNo issues found. Checked for bugs and CLAUDE.md compliance. |
This was referenced Jan 29, 2026
This was referenced Feb 2, 2026
Open
Open
Open
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Problem
When running migration code fixers (TUNU0001, TUXU0001) on multi-targeting projects, Roslyn inserts merge conflict markers when different TFMs produce different transformation outputs:
This is a known Roslyn/dotnet format behavior. When semantic analysis fails for some TFMs (due to different package versions, missing dependencies, or inconsistent semantic models), the namespace verification methods return
falseinstead oftrue, causing different transformation outputs per TFM.Solution
Modified the namespace verification methods in all three migration analyzers to only return
falsewhen we positively know the namespace does NOT match the expected framework:IsXUnitAssertion()now returnstrueif namespace is null or matches "Xunit.Assert"VerifyNUnitNamespace()now returnstrueif namespace is null or matches "NUnit.Framework"VerifyMSTestNamespace()now returnstrueif namespace is null or matches "Microsoft.VisualStudio.TestTools.UnitTesting"Test plan
Fixes #4612
Fixes #4613